Skip to content

libpod: use new libcontainer BlockIO constructors #19101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jul 4, 2023
Merged

libpod: use new libcontainer BlockIO constructors #19101

openshift-merge-robot merged 1 commit into from
Jul 4, 2023

Conversation

@haircommander
Copy link
Collaborator

@haircommander haircommander commented Jul 3, 2023 •
edited
Loading

libpod as it currently is is not compatible with newer tagged version of runc, as on that release branch the BlockIO fields are private. However, newer libpod need to use a newer version of runc (which happens to have the blockIO bits exported) to reduce the binary size of podman.

a compromise is libpod can use the constructors where applicable, so podman can build its own smaller binary (with a newer runc) as well as be compatible with the runc 1.1.z branch

Does this PR introduce a user-facing change?

none

EDIT (@lsm5)
[NO NEW TESTS NEEDED]

@haircommander haircommander mentioned this pull request Jul 3, 2023
Merged
@lsm5
Copy link
Member

lsm5 commented Jul 3, 2023

hmm, weird that Build Each Commit failed but packit rpm builds did not.

Change LGTM though.

@lsm5
Copy link
Member

lsm5 commented Jul 3, 2023

@Luap99 @mheon @vrothberg PTAL

lsm5
lsm5 approved these changes Jul 3, 2023
View reviewed changes
Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 3, 2023
@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 3, 2023
@mheon
Copy link
Member

mheon commented Jul 3, 2023

LGTM on my end

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2023
lsm5
lsm5 approved these changes Jul 3, 2023
View reviewed changes
Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/hold

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2023
@Luap99
Copy link
Member

Luap99 commented Jul 3, 2023

Bumping runc is fine but it should go forward not backwards. We cannot use the v1.1 branch, we want the latest code from main because otherwise runc will bloat us for over 2MB.
The reason the replace is there because go is unable to get the fact that our commit is actually newer then the latest release from the runc v1.1 branch. Please see containers/common#936 for the reasons.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2023
@haircommander haircommander changed the title remove replace and update for runc bump libpod: use new libcontainer BlockIO constructors Jul 3, 2023
@haircommander
libpod: use new libcontainer BlockIO constructors
a3a6227 
[NO NEW TESTS NEEDED]

Signed-off-by: Peter Hunt <[email protected]>
@haircommander
Copy link
Collaborator Author

haircommander commented Jul 3, 2023

@Luap99 @mheon @lsm5 how about this? I have updated the description with motivation, and tested the vendor dance in cri-o to verify it works as I wish it to.

@lsm5
Copy link
Member

lsm5 commented Jul 3, 2023

LGTM

@mheon
Copy link
Member

mheon commented Jul 3, 2023

No objections here

@mheon
Copy link
Member

mheon commented Jul 3, 2023

But I'll hold until @Luap99 can give a final OK

vrothberg
vrothberg approved these changes Jul 4, 2023
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, lsm5, vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Luap99
Luap99 reviewed Jul 4, 2023
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 4, 2023
@Luap99
Copy link
Member

Luap99 commented Jul 4, 2023

I still think we should at least bump runc to the current main but as for this PR I think this is the best solution given you want to backport this.

@Luap99
Copy link
Member

Luap99 commented Jul 4, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2023
@openshift-merge-robot openshift-merge-robot merged commit 5c302db into containers:main Jul 4, 2023
@vrothberg
Copy link
Member

vrothberg commented Jul 4, 2023

/cherry-pick v4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 4, 2023
Merged
@openshift-cherrypick-robot
Copy link
Collaborator

openshift-cherrypick-robot commented Jul 4, 2023

@vrothberg: new pull request created: #19111

Details

In response to this:

/cherry-pick v4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mtrmac mtrmac mentioned this pull request Aug 29, 2023
Closed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Oct 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@Luap99 Luap99 Luap99 left review comments

@lsm5 lsm5 lsm5 approved these changes

+1 more reviewer

@vrothberg vrothberg vrothberg approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lsm5 lsm5

@Luap99 Luap99

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@haircommander @lsm5 @mheon @Luap99 @vrothberg @openshift-cherrypick-robot @openshift-merge-robot